Auto merge of #2156 - alexcrichton:rebase-2058, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 19 Nov 2015 22:37:17 +0000 (22:37 +0000)
committerbors <bors@rust-lang.org>
Thu, 19 Nov 2015 22:37:17 +0000 (22:37 +0000)
Touching up a few last comments before landing


Trivial merge